From 4a30b340d959e4223307a7bb6e86ce62ff11be28 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 6 Aug 2003 20:53:30 +0000 Subject: [PATCH] bitkeeper revision 1.391 (3f316acaX8G5OlQyJ0l_ZX0sG-sl-A) schedule.c, xi_sched_domain.c: Fix setting of scheduler parameters from dom0. --- tools/internal/xi_sched_domain.c | 8 ++++---- xen/common/schedule.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/internal/xi_sched_domain.c b/tools/internal/xi_sched_domain.c index c8d921f890..1408be422b 100644 --- a/tools/internal/xi_sched_domain.c +++ b/tools/internal/xi_sched_domain.c @@ -21,10 +21,10 @@ int main(int argc, char **argv) op.cmd = DOM0_ADJUSTDOM; op.u.adjustdom.domain = atoi(argv[1]); - op.u.adjustdom.mcu_adv = atol(argv[1]); - op.u.adjustdom.warp = atol(argv[1]); - op.u.adjustdom.warpl = atol(argv[1]); - op.u.adjustdom.warpu = atol(argv[1]); + op.u.adjustdom.mcu_adv = atol(argv[2]); + op.u.adjustdom.warp = atol(argv[3]); + op.u.adjustdom.warpl = atol(argv[4]); + op.u.adjustdom.warpu = atol(argv[5]); if ( do_dom0_op(&op) < 0 ) return 1; diff --git a/xen/common/schedule.c b/xen/common/schedule.c index 3c1cef24f0..06f66518d4 100644 --- a/xen/common/schedule.c +++ b/xen/common/schedule.c @@ -208,7 +208,6 @@ long do_yield(void) ****************************************************************************/ long sched_bvtctl(unsigned long c_allow) { - printk("sched: bvtctl %lu\n", c_allow); ctx_allow = c_allow; return 0; } @@ -221,8 +220,9 @@ long sched_adjdom(int dom, unsigned long mcu_adv, unsigned long warp, { struct task_struct *p; - printk("sched: adjdom %02d %lu %lu %lu %lu\n", - dom, mcu_adv, warp, warpl, warpu); + /* Sanity -- this can avoid divide-by-zero. */ + if ( mcu_adv == 0 ) + return -EINVAL; p = find_domain_by_id(dom); if ( p == NULL ) -- 2.30.2